Skip to content

Add slim variants #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 21, 2017
Merged

Add slim variants #133

merged 1 commit into from
Jul 21, 2017

Conversation

tianon
Copy link
Member

@tianon tianon commented Jul 21, 2017

Closes #131

cc @bjornbak 👍

I think we should consider swapping the non-slim variants to not use -headless as well, but IMO that should happen as a separate discussion for this one (I only bring it up because having this is a precursor to being able to consider something like that, ala #130). 😄

@tianon
Copy link
Member Author

tianon commented Jul 21, 2017

Hahaha, whoops:

	'java-hello-world' [5/5]...Error response from daemon: manifest for openjdk:9-jdk-slim not found

(The openjdk:9-jdk-slim image isn't pushed yet, so can't be used for testing openjdk:9-jre-slim 😇)

@tianon
Copy link
Member Author

tianon commented Jul 21, 2017

$ for v in 6 7 8 9; do diff -u $v-jdk/Dockerfile $v-jdk/slim/Dockerfile; done
--- 6-jdk/Dockerfile	2017-07-21 12:27:42.366410292 -0700
+++ 6-jdk/slim/Dockerfile	2017-07-21 12:27:42.367410264 -0700
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM buildpack-deps:wheezy-scm
+FROM debian:wheezy-slim
 
 # A few reasons for installing distribution-provided OpenJDK:
 #
--- 7-jdk/Dockerfile	2017-07-21 12:27:42.367410264 -0700
+++ 7-jdk/slim/Dockerfile	2017-07-21 12:27:42.367410264 -0700
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM buildpack-deps:jessie-scm
+FROM debian:jessie-slim
 
 # A few reasons for installing distribution-provided OpenJDK:
 #
--- 8-jdk/Dockerfile	2017-07-21 12:27:42.368410235 -0700
+++ 8-jdk/slim/Dockerfile	2017-07-21 12:27:42.369410206 -0700
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM buildpack-deps:stretch-scm
+FROM debian:stretch-slim
 
 # A few reasons for installing distribution-provided OpenJDK:
 #
@@ -55,7 +55,7 @@
 	\
 	apt-get update; \
 	apt-get install -y \
-		openjdk-8-jdk="$JAVA_DEBIAN_VERSION" \
+		openjdk-8-jdk-headless="$JAVA_DEBIAN_VERSION" \
 		ca-certificates-java="$CA_CERTIFICATES_JAVA_VERSION" \
 	; \
 	rm -rf /var/lib/apt/lists/*; \
--- 9-jdk/Dockerfile	2017-07-21 12:27:42.369410206 -0700
+++ 9-jdk/slim/Dockerfile	2017-07-21 12:27:42.369410206 -0700
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM buildpack-deps:sid-scm
+FROM debian:sid-slim
 
 # A few reasons for installing distribution-provided OpenJDK:
 #

@tianon
Copy link
Member Author

tianon commented Jul 21, 2017

$ diff -u <(bashbrew list openjdk | cut -d: -f2) <(bashbrew list <(./generate-stackbrew-library.sh) | cut -d: -f2)
--- /dev/fd/63	2017-07-21 12:29:15.244751985 -0700
+++ /dev/fd/62	2017-07-21 12:29:15.245751956 -0700
@@ -2,18 +2,30 @@
 6b38
 6-jdk
 6
+6b38-jdk-slim
+6b38-slim
+6-jdk-slim
+6-slim
 6b38-jre
 6-jre
+6b38-jre-slim
+6-jre-slim
 7u131-jdk
 7u131
 7-jdk
 7
+7u131-jdk-slim
+7u131-slim
+7-jdk-slim
+7-slim
 7u131-jdk-alpine
 7u131-alpine
 7-jdk-alpine
 7-alpine
 7u131-jre
 7-jre
+7u131-jre-slim
+7-jre-slim
 7u131-jre-alpine
 7-jre-alpine
 8u131-jdk
@@ -22,20 +34,26 @@
 8
 jdk
 latest
+8u131-jdk-slim
+8u131-slim
+8-jdk-slim
+8-slim
+jdk-slim
+slim
 8u131-jdk-alpine
 8u131-alpine
 8-jdk-alpine
 8-alpine
 jdk-alpine
 alpine
-8u131-jdk-windowsservercore
-8u131-windowsservercore
+8u141-jdk-windowsservercore
+8u141-windowsservercore
 8-jdk-windowsservercore
 8-windowsservercore
 jdk-windowsservercore
 windowsservercore
-8u131-jdk-nanoserver
-8u131-nanoserver
+8u141-jdk-nanoserver
+8u141-nanoserver
 8-jdk-nanoserver
 8-nanoserver
 jdk-nanoserver
@@ -43,6 +61,9 @@
 8u131-jre
 8-jre
 jre
+8u131-jre-slim
+8-jre-slim
+jre-slim
 8u131-jre-alpine
 8-jre-alpine
 jre-alpine
@@ -50,6 +71,10 @@
 9-b177
 9-jdk
 9
+9-b177-jdk-slim
+9-b177-slim
+9-jdk-slim
+9-slim
 9-b154-jdk-windowsservercore
 9-b154-windowsservercore
 9-jdk-windowsservercore
@@ -60,3 +85,5 @@
 9-nanoserver
 9-b177-jre
 9-jre
+9-b177-jre-slim
+9-jre-slim

@yosifkit yosifkit merged commit 7e4d6aa into docker-library:master Jul 21, 2017
@yosifkit yosifkit deleted the slim branch July 21, 2017 19:33
tianon added a commit to infosiftr/stackbrew that referenced this pull request Jul 21, 2017
- `httpd`: add `apr-util-ldap` to Alpine for `mod_ldap` (docker-library/httpd#65)
- `memcached`: 1.5.0
- `openjdk`: windows ojdkbuild 1.8.0.141-1, add `slim` variants (docker-library/openjdk#133)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants